; Manually fix merge errors in etc/NEWS

diff --git a/etc/NEWS b/etc/NEWS
index dd1f1bbf24f173ee83573da7fd60816f1b03354f..af7f1050b763a0fa01abd144d384e24a2628e957 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -71,9 +71,6 @@ switches for shortlogs, such as the one produced by 'C-x v L'.
 You can now configure how to display the "*buffer-selection*" buffer
 using this new option.  (Or set 'display-buffer-alist' directly.)
 
----
-*** New user option 'ruby-method-params-indent'.
-
 ** Eshell
 
 +++

diff --git a/etc/NEWS.29 b/etc/NEWS.29
index 017fd850b4efb5b4c976695e7b99a246d976a2c2..0e84459634706e670985f756d9b83db91339da1a 100644 (file)
--- a/etc/NEWS.29
+++ b/etc/NEWS.29
@@ -2761,6 +2761,9 @@ project-dedicated or global) is specified by the new
 ---
 *** Support for endless methods.
 
+---
+*** New user option 'ruby-method-params-indent'.
+
 ** Eshell
 
 +++